From a4af3c84c0951a73d79881f35b49d8c8dfc3fde6 Mon Sep 17 00:00:00 2001 From: "mwilli2@equilibrium.research" Date: Wed, 11 May 2005 23:27:00 +0000 Subject: [PATCH] bitkeeper revision 1.1389.15.20 (428294c4qHPwfJns6WjtuWHA518RQg) Build tweak for earlier domU ACPI fixes. Silly me. Signed-off-by: mark.williamson@cl.cam.ac.uk --- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c index 9b4ce0892a..a53fdd31d4 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c @@ -1571,12 +1571,14 @@ void __init setup_arch(char **cmdline_p) op.u.set_iopl.iopl = current->thread.io_pl = 1; HYPERVISOR_physdev_op(&op); +#ifdef CONFIG_ACPI_BOOT if ( !(xen_start_info.flags & SIF_INITDOMAIN) ) { printk(KERN_INFO "Not running in dom0: Disabling ACPI\n"); acpi_disabled = 1; acpi_ht = 0; } +#endif /* * Parse the ACPI tables for possible boot-time SMP configuration. -- 2.30.2